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

* commit '0e472bc0a14ef9c2ea2369a4f4b2c8de66608bb9':
  Improve large object free CHECK