Merge "Fix spurious finalizer timeouts on shutdown."
am: 90524d3d0c

* commit '90524d3d0c970d629f4e9ffcacea267049a83f6b':
  Fix spurious finalizer timeouts on shutdown.