am de8e618e: am f533cd0d: am dacee920: Merge "Fix missing transaction abort error message"

* commit 'de8e618e3c4b9ad5437772136ba30e49c3c95781':
  Fix missing transaction abort error message