Snap for 8192848 from 170bb80e2afbfdbc7f4cbc15c699687262e762a0 to tm-frc-os-statsd-release

Change-Id: I6331dcc63e0e2da88415f8f69e94dfa3d0cf9930