Updating Cirrus to master (a310e9f9)

Change-Id: I619e5db179d6bb44966e16c9877ccc3f0c465694