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

Change-Id: I3a9daebb33791646e81506306edaadab445056eb