Snap for 8189365 from 91b18b36827744ffd26da5ee18e74954866d3a63 to tm-frc-os-statsd-release

Change-Id: I4e89562795a90525dc98b089189bf46b002eeb05