Merge "Add System Tracing capability to Sync Manager" into jb-dev