Update Cirrus to include 3 small fixes

Change-Id: I876d28fe30215e3729a9deb4d5073939bef7cb5b