am 95482b61: Merge "Fix an issue where we could wait for a non-existing transaction" into ics-mr1

* commit '95482b61c348fc54bf44a96a8b73011c90b40520':
  Fix an issue where we could wait for a non-existing transaction