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