Merge "sdcard: mute false compiler alarm" am: cb4e164562 am: 124294a348
am: e657bf552c

Change-Id: I1e75decd46537a7697840908146981a4650ca417