am 3da47942: am 944ea1a3: Merge "Clean up abort."

* commit '3da47942d3fdeb6f39cf84b03c75cfeb69f91449':
  Clean up abort.