Merge "Remove CoreTests: HeapTest" am: c3fd3b8c7d am: 19d39ee384
am: 1cfc324de1

Change-Id: I884488795303effda4274978c93e086cee433272