Updating Cirrus to master

Change-Id: Iffbd000055c29bbfaa11b54e0111fe30b25b6682