am b5325e24: Merge "Revert "Fix OOM throwing if it happens in finalizer reference""

* commit 'b5325e24ca58299b2b011e57e784b2584f99d687':
  Revert "Fix OOM throwing if it happens in finalizer reference"