Snap for 8564071 from 701de756a4d026ac5e570e65671c8f00b73c2390 to mainline-os-statsd-release

Change-Id: Ia9fc29dec2c21f6af625ca4723051b4739e2782f