Merge "Add TEST_MAPPING for gating and logging" am: 05fb4434f3 am: 5d3e5fb3b5 am: 4c0d1a02b6

Change-Id: I5da9a24dac34cea069906337b8d39cbe43c20213