Merge "Fix transaction phase offsets" into pi-dev am: 68f97b1052
am: 6bdefc7f2e

Change-Id: I9dc31026ecd1f82e1bfb3cdd3f5cc64e2e0d8460