Update Cirrus to master

Change-Id: I713f2f159b7b4314b1e8b11cec465cce01fdc768