Merge "Add OWNERS for BatteryService"