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

Change-Id: Ie1963bb7965827d9f9985b08c78e70b2de3319a7