Merge "Sync TEST_MAPPING file from master branch" am: 38b83f0558 am: fbf163294a am: 0550352f2e
am: 3ed7d223e8

Change-Id: Ia20c5073cc94501d61838c9beb4c51a8c25bc56d