am: 4a1f68f8 * commit '4a1f68f8': Fix heap check. Change-Id: I37f60e6c5b160e18221b7ace1de10b2072685c6e