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

Change-Id: Ic5f1c2a2d92aad10ed3aa113b17e809037c2b697