[ros-diffs] [janderwald] 50742: - Fix batt build