Merge "msm: ion: Fix crash when CP flags are none"