Merge "msm_rmnet: Fix potential memory corruption"