Updating Cirrus to master

Change-Id: I18713b757266e3dc266f4a2e4d411d8e63b738ae