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

* commit '7bc272601adc7a8b4fb3176ed6353761cd9e4c2d':
  Fix spurious finalizer timeouts on shutdown.