Snap for 7550844 from 04e935211a41e94ee35fe62e131d30ab034fe03e to mainline-os-statsd-release

Change-Id: Iec42f0b821fe0141be81ef0c0db88a2b9d3b6ddb