Merge "Merge history of cts/hostsidetests/statsd"