Merge "msm: ipa: rmnet: Make code changes with respect to CR#2046006"