Merge "Fix dumpsys output for staged install version"