Snap for 8564071 from a06f3e32ddac3d4ed41805756b225eb040844c19 to mainline-os-statsd-release Change-Id: Ia7c3a02fdd012b44e0104b90eb2c9ed50f726e8e