am 2830b922: Merge change 4977 into donut

Merge commit '2830b9226bc737da970f8d20601ccde19008415c'

* commit '2830b9226bc737da970f8d20601ccde19008415c':
  Update the gservices gtalk setting for the terms and services url.