am: 25e6bb4b * commit '25e6bb4b': Fix heap check. Change-Id: Ia49a3d617789c3b3bbd802b7029c561a82fb54a3