Snap for 7550844 from dfeafb50717e08caed6201f078149f3b9f5b11c4 to mainline-os-statsd-release

Change-Id: Ifc9a4357e27662555b2eff2bb6ebfe750292cf06