Snap for 8736029 from a1c0e6162f259e6cbb27432707ae9c4ca569cbda to mainline-go-os-statsd-release

Change-Id: I8aae434d313dde6d88c0a12b0a5e78075fc12410