Snap for 7132927 from 48ac8eccac379f641db8161c59f8b269021fce66 to mainline-os-statsd-release

Change-Id: I9b30230f30544addcf4e74e748bd1d0628c42d41