Snap for 8736029 from 9df1a1b6232654ead8a3fc4f3cf4e66be45661bb to mainline-go-os-statsd-release

Change-Id: I0546d5a00fb10a6099828d5fc0a538360445765b