Snap for 8512216 from 76fcb4dda691aef94a73d1c23e4309be70753005 to tm-frc-os-statsd-release

Change-Id: I2d4e1e9788ca83f4f41b8711ecb8778a151a1dbe