Updating Cirrus to master

Change-Id: Id7595e548a1ca178d420918d0e02462272b1884f