Merge "msm:ipa: mhip ring size optimization"