[automerger skipped] Merge "Add TEST_MAPPING" am: 9551a91b5b am: fa253e4840
am: ff022f77dc -s ours
am skip reason: change_id I301c5c8be70f0f2c514f14138805a8c545dea074 with SHA1 a7f4d66fa8 is in history

Change-Id: I54083ba36bf9b8ce9b5144815671a63513c935cd