Update to msm_rotator from jb_2.5 caf branch