update cirrus to master

Change-Id: I27bd52cdb7ee84dac94443bb2bae4fec17b89b43