[ros-diffs] [fireball] 25468: - Merge two small fixes from 25400 - Merge 25401 and 25402