Merge change 5316

* changes:
  add Gservices setting for data messaging app token url.