Snap for 8736029 from 0899a09b09a65f576a372db1c50c2f3c0bd36aa0 to mainline-go-os-statsd-release

Change-Id: I345356df7a5f7a2e7ea4af3f4eaab22f05f8dd63