Snap for 11181721 from 6ec837f56b25a7517a3871a6d73701a49c9cf58e to mainline-os-statsd-release

Change-Id: I036b8a000dda09f4e31818fe5ab255390222e14b