Merge "Make batterystats less chatty" into oc-dev