Merge "Fix NE when DumpKernelStack" am: 1be5505422 am: dffa4fb974
am: 21f776b0b2

Change-Id: Iabb2e441e7f9dc78bacc692b42e83e026affd1ae