Merge "msm: 9615: include msm-specific ion header" into msm-3.4