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

Change-Id: I71c65003b9ea4522c9f11faa772873a50629c9ba