Snap for 9257508 from 12cbcd4b908e8d34431e9aebf0fc36e4457bb6a1 to mainline-os-statsd-release

Change-Id: I2ca0f0c37ca616f6387596e9097d84b764bf1737