fix remotes

Change-Id: Ia2365d6a717e90fa2a91896b5296715bb541398e

Conflicts:
	default.xml