[ros-diffs] [zguo] 71045: Last rapps sync patch for rapps_new. Sync by Mark Jensen. Patch by toe_head2001. CORE-10986