am 9492b6e7: am 2de8102d: Merge "Fix bug in abort message processing."

* commit '9492b6e72cef71422ba624e3cd11f07156cfb34a':
  Fix bug in abort message processing.