am: cfc51f2f * commit 'cfc51f2f': Fix heap check. Change-Id: I5226539f6799bd3fda8a39929c863c6ef47bf1cb