am 77b7d785: Merge change 4117 into donut

Merge commit '77b7d7859ab8a4ab66a31375826ddfe17dc69c07'

* commit '77b7d7859ab8a4ab66a31375826ddfe17dc69c07':
  Add a Gservices setting to have a "use location for better search".