Merge "Improve 080-oom-throw-with-finalizer."