Merge "Fix packet reduction in SamplingStatsdClient"