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

Change-Id: I701ef53dada696ee5f6e45d8539ca385a08ffc29