Snap for 7132927 from 7067d75adeb633f60ff662aef10934d30f7d82ff to mainline-os-statsd-release

Change-Id: I02d694bca19c045d25a5f9a430285cae0f3040c7