Fix query toBuilder()#585

aozarov merged 2 commits intogoogleapis:mastergoogleapis/google-cloud-java:masterfrom

ajkannan:fix-query-to-builderajkannan/gcloud-java:fix-query-to-builderCopy head branch name to clipboard