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