Merge changes Ic85cab22,I97791a80,I521eb50c

* changes:
  Add support for concurrent data sources.
  Make NetworkTraceHandler thread safe
  Refactor Network Tracing into separate data source