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

* commit '2de8102d422f48eec44fe8782cd2411f04f1dcb2':
  Fix bug in abort message processing.