Merge change 6569

* changes:
  modify Gservices setting for push messaging registration url.