Tentative. Looks like heap poisoning breaks with this change. bug: 9986565 This reverts commit e6316940. Change-Id: I5c63758221464fe319315f40ae79c656048faed0