Merge "msm: ipa: prevent string buffer overflows"