Merge change 3134 into donut

* changes:
  Change the default client id for better stats