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