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

Change-Id: I0b85e0047093adb5b9ff825dd0f4a5615643d81d