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

Change-Id: Ifc41225d6e7c0de5c9ebfffaf06736366651cd30