am 0170810c: am 95482b61: Merge "Fix an issue where we could wait for a...
am 0170810c: am 95482b61: Merge "Fix an issue where we could wait for a non-existing transaction" into ics-mr1
* commit '0170810c':
Fix an issue where we could wait for a non-existing transaction