Merge "Improve dumpsys for installed distros"