am d6dd686b: Merge change 4805 into donut

Merge commit 'd6dd686bc7adba448af1bc36a022cddba9f9561f'

* commit 'd6dd686bc7adba448af1bc36a022cddba9f9561f':
  add GServices settings for Google Talk privacy and legal urls.