Snap for 7642458 from 0f760307e6d0d5eb26825ef38b325309d82bdc7f to mainline-os-statsd-release

Change-Id: Ifd4d4c56f2603ad3c3fe08b6b44d69c001924a03