Merge "Update TEST_MAPPING file under Activity path."