Update cirrus to master again

Change-Id: I8383c23f46e51c3310ae8f057ac9925faea9f0f7