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

Change-Id: Iab6cc70e806f9471d83c1a17764db4ebf98f5b37