Snap for 8736029 from 6890dd6e12e7206b0214e3c1178f3f852ec37437 to mainline-go-os-statsd-release

Change-Id: Ie5121d3fdc3b088990253892a4a97c33e413b151