Merge "Update OWNERS files for tracing"