Merge "Sync TEST_MAPPING file from master branch" am: 38b83f0558
am: fbf163294a

Change-Id: I23b25f09c35326a0608e6d30eaa3e7e65f1b5582