Merge "BatteryStats: Remove too-verbose logging" into oc-dev