Merge "Catch SecurityException within LatencyTracker" into udc-dev