Merge "Update D8 reference file for 913-heaps" am: bac2a691fe
am: 09384a4469

Change-Id: I51603114863ac5a574a8f2aac3065d36a3e7a6a2