Snap for 10453563 from 3bcd6a5bd79717fd982b3c94abe4d6224d5a908a to mainline-os-statsd-release

Change-Id: I52dc63512997edc51cd55922e3abaedaeb7391b4