We don't want to be 'dexing Mms

Change-Id: I25c9608003c5e591798acd108d0a9be375939c3e