Update Cirrus again

Change-Id: I1cbc8597c1b9c72e55cc3ecbf745ba217c2a266e