Updating Cirrus to master

Change-Id: I0e2653c75f39cbc013b4085185b3aa195d6f0433