Merge "dumpsys += TEST_MAPPING" am: 79c73f4a9e am: bce5a0fb92
am: e649642b18

Change-Id: Ib5e50e539df8c87aa447ee680ccba71530b431b6