Snap for 8736029 from 55a4a561f793c69f7acb3105b240b60b30490a9f to mainline-go-os-statsd-release Change-Id: I12470a84f283da1d0547991c9112724bcb69d93f