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

Change-Id: I910b302dc1aa5fc3f8de374dfa96f1904546d6c8