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

Change-Id: I7766e6e91c1a42a8382b0117607080d7d5835a2b