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

Change-Id: Ia4c62e890f007c43b7fa0fd557b583ee455a1e3b