Merge "msm_bam_rmnet: Fix potential memory corruption"