am b6112433: am 0e472bc0: Merge "Improve large object free CHECK"

* commit 'b6112433a1c4b14a29e610ec5f6efb89d15ed805':
  Improve large object free CHECK