Merge "mm: Fix a compiler warning." into msm-3.4