mach-msm: Fix merge conflict in previous merge commit.