Snap for 8564071 from 5f9a90afd9c88cbfd7a1b44669aca3aedf72a24d to mainline-os-statsd-release

Change-Id: I40ab09c44191d24bb8b56ae66a3f37ac99ce7d22