[automerger skipped] Merge "Update reference to test in TEST_MAPPING" am:...
[automerger skipped] Merge "Update reference to test in TEST_MAPPING" am: 7ee30a44 am: b68b1b94 -s ours
am skip reason: Change-Id Ibb9618bf0f1fdce6ceceb808705dab910b38755d with SHA-1 13c4457a is in history
Change-Id: I42cf52884775213726fdf7d9ffdd0d685ed9bea9