Merge "Add more systracing everywhere" into nyc-dev