Add flag to prevent M8 using this

Change-Id: I174615c8b520c07d4d084bd3e98137f2e8c85412