Snap for 8627662 from fd8b71898f448a9c11b9bf8fb2b099eaa888f9c7 to mainline-os-statsd-release

Change-Id: I549336d5d61c96bb2c973e7961aa59e48c6b1d72