Merge \"Show \"0\" instead of \"0 B\" in storage settings.\" into nyc-dev
am: 87fcf9e95f

Change-Id: I94d18998914552d21099b12b22471ea93857cf52