Reduce impact of linaro's git failing

Change-Id: I959b71382b9cfd9b61071790099ba56014f11d76

Conflicts:
	default.xml