Snap for 9551394 from 303092c46f33f8ba0ce0f9df1bc43b8a7f4bcebd to mainline-os-statsd-release

Change-Id: I2c13233e3e6e4b38fb4f4c54c94d8badfb613293