Updating Cirrus to master

Change-Id: I267ece5cad94945ee2819443ec13828b45995a60