Snap for 8192848 from 9092743d2e800d4e253400457aa051f3215ba8a1 to tm-frc-os-statsd-release

Change-Id: I9012037e1251e8a4c2c9f72cb714f37ba604c2a9