Merge "Add TEST_MAPPING" am: ed8cbcca55
am: e6ef4c306d

Change-Id: I7d87cf6e2fcfcce3dbd8a5cc8185406c4f6e3ab1