am 6cebc3d2: am ae36b4a8: Merge "Use specific exception class to abort transaction"

* commit '6cebc3d24d016246c704b21fab7f2853892a6abb':
  Use specific exception class to abort transaction