am bd34f7db: Merge change 3134 into donut

Merge commit 'bd34f7dbbb25059121c2eb9f0d3d8478d78e7e63'

* commit 'bd34f7dbbb25059121c2eb9f0d3d8478d78e7e63':
  Change the default client id for better stats