Merge "Revert session-transfer change" into oc-mr1-dev
am: 7bec053dff

Change-Id: I0e9f40dccf423899b48ba8af9f2c266d6f32dc1f