Reconcile repos to Cyano

Change-Id: Ib1676e70d1bea1b90f3c8f15f620d59d6ab0e994