[ros-diffs] [fireball] 22979: Re-apply fixes to CPL accidentally reverted by Magnus's reverting commit