Update Cirrus to master

Change-Id: I05c1f99d7ba30857720a6580bab4e81742c42939