Merge "msm: ipa: fix wrong usage and cleanup dead code"