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

Change-Id: Ie232208b30c898ae3946a4a56109aa5ddd249571