Snap for 10453563 from 511409d5c2d7d92eca7dfcfe0353f86bbe024b41 to mainline-os-statsd-release

Change-Id: I702d62ac9c4781107fb7b826bb602185a99305b3