Merge change 4805 into donut

* changes:
  add GServices settings for Google Talk privacy and legal urls.