Merge "Add TEST_MAPPING" am: ed8cbcca55 am: e6ef4c306d
am: 76bc9eb84b

Change-Id: I4d10a82ef938eb3daf96b80fd04aea6a6a8097fe