[ros-diffs] [hyperion] 37077: Merging 37059-37076 due to rbuild changes