Merge "Update expectations for 913-heaps for new D8 version"
am: aed79fb351

Change-Id: I7b390a7f129ec23baf907576e34d6c6977e4378a