Merge "Add TEST_MAPPING" am: 9551a91b5b
am: fa253e4840

Change-Id: I9c96ca4218940b6cc565e30c1d0bb6db11206b4b