Merge "Log battery stats before ScanClient gets removed" into oc-dev