Merge "Update TEST_MAPPING." am: aa15ef4d0e

Change-Id: Ib8a1db306ab284880d56c08fe1d4023051591f5b