Merge "Fix heap poisoning build"
am: ec8a998b08

Change-Id: Ia44d577e98c0118ef358318012ccf01563413c9a