Merge "Test newly added batterystats background stats" into oc-dev