Merge "Bump up batterystats version to clear stale data" into oc-dev