Merge "Fix format of subsystem power stats" into oc-dr1-dev