Merge "msm: io: Fix section mismatch warnings" into msm-3.0