Merge "Sample rate 0 means a route-dependent rate" into nyc-dev
am: db52e5e3dc

* commit 'db52e5e3dc15f7233ccd9c128fe43f2b2f58b29b':
  Sample rate 0 means a route-dependent rate