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

Change-Id: I422861735e9ca1b8f6b3e654a95647557e51f07d