Merge "Fix a deadlock involving BatteryService." into jb-mr1-dev