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

Change-Id: Ida774f9e2359190f6b864729e182179f6f186470