Switch Cirrus to a faster query type

Change-Id: I8fb9172cc7d2f638c0a094b7a01dcb2ec2230ced
Merge "Switch Cirrus to a faster query type"