Merge changes from topic "dumpsys-pid-round-2" am: 7f13f05ea5
am: ae70639a8c

Change-Id: If706faf99bc35ee3a7a2985a0fae13936f639902