Updating Cirrus to master (a310e9f9)

Change-Id: I061e55ff1ccb1163d259f104bfc3b31571052dc5