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

* commit 'f84f7fa4d280e02c5cfc5730c64693f3e20eb5c5':
  Fix bug in abort message processing.