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

Change-Id: Ia6c4d8a00a4c01ab4adab5ae7ce2ba04e2fa76a2