Merge "Fix fault_handler with heap poisoning." am: aa03f6fa38 am: 92f47fb522 am: dd59e55e1a
am: 94c7f5f1a9

Change-Id: If531999160323e2e2f7840e861ce94f91c5008e5