Merge "Fix an NPE in BatteryService" into rvc-qpr-dev