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

Change-Id: Ic80193f847e4b8c8700f27b251dbf8cd5cb9d316