am 22c1502d: am 911b4be5: Merge "Fix transaction aborting"

* commit '22c1502d41eba37bf6bf0a7837a780cb0bf5d747':
  Fix transaction aborting