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

Change-Id: I3541b76296d2de1f7d34d8124fc4ee90595841da