Clean up Xoom and M8 groups

Change-Id: I6a713556a63244e9fcc8651493c94359b842a144