Updating Cirrus to master

Change-Id: I2e44ab003c1dd5704687bed9cf11044b33461aa1