Add M8

Change-Id: I7f60cec0bcfb7a54778d12d4130397d5d80cc41d