Add TEST_MAPPING am: db1064dfc0
am: ba880b42d0

Change-Id: I35f8a602b541dead330d42ab2703e0cfd0402934