Commons getting Cirrus as primary

Change-Id: If634e555c897158b3c67a62e5b72b97c67fc599a