Merge "Remove BatteryController reference from ReverseChargingController"