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

Change-Id: I749aa6a5eaf2fdef194a3f626f9f884071186368