[ros-diffs] [cfinck] 37172: Merge in r37155