Merge "Fix heap poisoning"
am: 85b1811f0d

Change-Id: Icaa40d52acfe3899e16da0b0713c97fa0e1e288e