Merge "Remove @Inject from BatteryControllerImpl"