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

Change-Id: I6e8964c4eb7426b838c5f780a5c87136bfbc24e5