Snap for 8736029 from 683bdac642bc8e7322c71aede4c8880301f8da86 to mainline-go-os-statsd-release

Change-Id: Id4e37eb4b97cd15b7b52614524f060ae5fd15826