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

Change-Id: Ic5fdbbcfed2d840a74b01443d9ba5806b52f4745