Merge "Fix heap check." into nyc-dev
am: 25e6bb4b9f

* commit '25e6bb4b9f80a0b1d5bb2962bd7d0ac3c545efaf':
  Fix heap check.

Change-Id: Ia49a3d617789c3b3bbd802b7029c561a82fb54a3