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

Change-Id: If574c07ccc828b0bb157743be895e060d4a836dd