Merge "Move Heap::GetInstances to use Handles" am: 4c91f05a9a am: 7c01c29e32
am: 042f5ff1cf

Change-Id: Ib25610850522bcdc9389b6a7fdbecaa151ce964f