Merge "Fix out-of-order transactions (2/2)" into oc-dr1-dev
am: 0436b01d1b

Change-Id: I021a2635b40e74f29e1d94ad4a738f3b043ed5db