mmi: Fix mismerge in commit d85eeffffc0f83f65b65ff9f19d2fe46367d8c75

Change-Id: I35f5e8ab1ed278e912825c8e4c50d6d41c1b5b2d