Merge "Fix patchoat_test for heap poisoning" am: 2607d6c471
am: 5fcf60384a

Change-Id: Ie4224b191d4809f0f5b996b470a075d2a06f1e17