Update Cirrus to master (64fab3d2)

Change-Id: I7e4d29333171602880f9712e19c8bb8db657aed2