[ros-diffs] [sserapion] 36924: - Sync to trunk 36919. - Modified a few rbuild files to conform to trunk rbuild.