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

Change-Id: Ic1eaa712fac611b3a4701c5b7775d9249a867a6c