Snap for 8564071 from 38837ea34500c144ba427283e034563bfbc6e68c to mainline-os-statsd-release

Change-Id: If8b00f4db51ecb9f888c0423ea9bc5b9779e425c