Updating Cirrus to master

Change-Id: I1a393957dbde0f9377cae2206d522041d111c9b4