Merge "Fix dumpsys output for staged install version" am: 7fc43b1fbd am: d725e7aeab
am: e17e10a123

Change-Id: I49e05c4578478b893bc378e2a7b2f10e90727e89