Merge "msm: rmnet_bam: correct error handling" into msm-3.0