Merge \"Improved storage size detection.\" into nyc-mr1-dev
am: f0de4da42f

Change-Id: I9794d1d3e15177c88e49911e1b406433025e85c4