Merge "Fix heap poisoning build"
am: 6428a18165

Change-Id: I5b8b02d5c28cc8c3760f78035408528d78a9a742