Merge "Revert session-transfer change" into oc-mr1-dev