Merge "Remove unnecessary finally blocks for tracing."