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

Change-Id: Ied4ea6aeb589ed0b64e16b40b8a7df2ddf50b99b