Merge "Update dumpsys output"