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

Change-Id: Idd1cf7e930e7452d09fd0618d4355aff94c3e96b