Merge "Improved storage size detection." into nyc-mr1-dev