Merge "Include additional information in the dumpsys" into pi-dev
am: 38e09dd7e1

Change-Id: I3dd0f79193cdb71b46ff9d4477d431ee6a703fb3