Merge "Prevent concurrent modification of battery history in tests" into udc-dev