Update Cirrus to master

Change-Id: I5d5b2fce660f3ff8fa36b6ee189b3ce50f69bcbf