Change should_sample
parameters to be spec compliant
#1764
Merged
should_sample
parameters to be spec compliant
#1764