Is bottled water still hard to find in Tokyo?

Question:

Are people still hoarding bottled water and other basics like toilet paper?

Answer:

I'm living in the outskirts of Tokyo, there is no shortage of bottled water and toilet paper.
Some commodities such as cigarettes, natto(fermented soy beans), cup yogurt are in short supply.