Update Cirrus to master

Change-Id: I370e38e49bedbebe48be381deb9909d505437660