Merge "Update TEST_MAPPING." am: aa15ef4d0e am: 075f813c3b am: 15ed882026 am: 737b993791 am: 6975f91d56

Change-Id: I04df2f84e7dcf12f1308a58c1d28004bad657f0c