Merge "Add TEST_MAPPING"
am: ed8cbcca55

Change-Id: Ic1c6a713fc626e4dacb540103528868733af723f