Merge "Fixed storage calculation when SD card is adopted as internal storage." into nyc-mr1-dev
am: 4fd371d344

Change-Id: Id95a997997b97006367c7180ca26cafb15435f42