Merge "Fix some synchronization issues in BatteryService." into jb-mr1-dev