Fix sync again again

Change-Id: I89f615843d8da42d4ff1dc8d204e206fdff568f3

Conflicts:
	default.xml