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

Change-Id: Iaf9b1744ab6fac8d7360d511e41149fab77148ee