Merge "ion-unit-tests: Add heap id verification test." am: 32017407fd am: e677c33cc4 am: ca59dd1706
am: 44c925c6e6

Change-Id: Id90e881680692193bb3b3a4fa29d6f935cbb4c90