Merge "8660: Add support for Ion" into msm-3.0