Merge "Add TEST_MAPPING"
am: 9551a91b5b

Change-Id: I046f6812587b9366ac9d3a684e45b2f2ef9d87e0