Merge "ion: Revert upstream changes for now" into msm-4.8