Merge "mm: Fix infinite loop when offlining" into msm-3.0