Merge "Add TEST_MAPPING."
am: 11dff3e91c

Change-Id: Iea597b57ed81f11d05ae758a1ec421a3327ef5c1