Merge "Initialize uninitialized member in BatteryService" into udc-dev