Merge "Find abi before trying to decode the stack." am: 782e50b099
am: 975d372e42

* commit '975d372e42d9fb1de431e6247d81947ba86d40b4':
  Find abi before trying to decode the stack.