Update Cirrus to master

Change-Id: Iac00dda111e8735c4f1a172f898be224df1454ad