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

Change-Id: Ieffc5d17625de615d8ba149e7c166c5bc2900c91