Merge "msm: 7627a: include msm-specific ion header" into msm-3.4