Merge "Update TEST_MAPPING." am: aa15ef4d0e am: 075f813c3b

Change-Id: I02f1a04c5ba9f9411792638e7e5214b775885f22