Update the queries for device validation.
Update the queries for device validation.

Also fixes the golint errors that are constrained to validate.go.

pmuetschard/gapid,google/agi,google/agi,google/agi,pmuetschard/gapid,google/gapid,google/gapid,google/agi,pmuetschard/gapid,pmuetschard/gapid,google/gapid,pmuetschard/gapid,google/agi,google/gapid,google/agi,google/gapid,pmuetschard/gapid,google/agi,google/gapid,google/agi,pmuetschard/gapid,google/gapid,google/gapid,pmuetschard/gapid