Snap for 10453563 from e3b913f679647534152b51aed8f2338fd746f369 to mainline-os-statsd-release

Change-Id: Ieac9f161bf138a9cfbbc4014f2797372794b9edf