Merge "Include additional information in the dumpsys" into pi-dev