Merge correct branch for GeminiQuery API changes:

This is what should have been merged.
78c2c84d72e3d52379e3e4fa2b01c934a210f146 was in error.