updates to msm_rotator from caf jb_2.5