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

Change-Id: I4323d366104435fa5e04262d546fd00be06722e2