Snap for 8192848 from a3a652d3d73bb8b135c4c9d9e33541f130f984a3 to tm-frc-os-statsd-release Change-Id: I4105ab5c1ca679bf8200149eab14cf3fd733ee1b