Merge "Pass all scans to battery stats" into oc-dr1-dev