Merge "sdcard: mute false compiler alarm"