am 53f1a815: Merge "Remove unnecessary finally blocks for tracing."

* commit '53f1a815b4401f10cd833217143da44ab0408dcc':
  Remove unnecessary finally blocks for tracing.