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

* commit 'fc2895df75f7cdb483a9ba5d42bc2a9df0e25b4f':
  Fix spurious finalizer timeouts on shutdown.