Merge "Sync TEST_MAPPING file from master branch"
am: 38b83f0558

Change-Id: Ie836bbf345dfd54f657b96bc02b2c44c166d93f4