Merge "Fix some more statsd cts tests" into pi-dev