Snap for 8512216 from ddd2f63ef75b31cd37ad49725d48361c0ebff798 to tm-frc-os-statsd-release

Change-Id: I213342ebe3008ffc86099817aedbb72020ff0a66