trying to underp the sync

This reverts commit 0398bb71451aa17e87e294ec025b53873e5f1688.
Revert "pull in m7 variants"

This reverts commit 656e0510f7a57783b7622e57db24bec729689e39.

Conflicts:
	default.xml

Change-Id: Ie55587d282ddde7cff77f166997860907acfca9c
fix this

Change-Id: Ia160337f9eee94a2c16975c3537c977466c91101