Merge \\"sdcard: Use std::map.\\" am: c15ab6e2c6
am: 0d039c4c44

Change-Id: I2b1daae1c466fdc50b15f3a0d6a39d15c70014e5