Merge "Fix format of subsystem power stats" into oc-dr1-dev am: 5512504bba
am: fe4ec9e946

Change-Id: I7dba5de4a5de74fd654ae5d1fe03abc625510f16