Merge "msm: fix vfe stop sequence." into msm-3.0