Merge "Add more tests to TEST_MAPPING." am: e97ab97920 am: 9f92d3633a am: 4ec6b1cb79

Change-Id: Icd3885e48f9c01ca6bcaf4cc18f84da441921609