Add TEST_MAPPING
am: db1064dfc0

Change-Id: I073f708ee1c9cdd43d31ee86d2cc351acbd3332a