Snap for 8580258 from 365e76c21135d25126ba2757eb3aa7e3826b8ac3 to tm-frc-os-statsd-release

Change-Id: I87034676226e56c135a2710a4b026af448c1ba65