Updating Cirrus to master

Change-Id: Ie339901ceebd3616ab8d4fdc5b001f295a37c60f