Merge changes I54d54f24,I0c384eb3 into oc-mr1-dev

* changes:
  Disable screen-off RPM timing in BatteryStats
  Added resource power manager stats to batterystats