Merge "Add TEST_MAPPING." am: 11dff3e91c
am: 07b78bb51b

Change-Id: I183fa61b7265cdad4cfe03367930f04df18518b6