Fix-up for Ic952146b5: check $mpm, not $selected_mod

Change-Id: I3f1bb771318831e2989a67c4385f9327677575c9
Merge "Fix-up for Ic952146b5: check $mpm, not $selected_mod" into production