Snap for 11044279 from b6757207db5dcfd8412911840e4a2a6bedada348 to mainline-os-statsd-release

Change-Id: I55786e8de22462933ac59638d2af10e64f540b3b