Add m8 support

Change-Id: Ic17cffd242412e51301672c7c47d0055cf681825