Revert "Revert session-transfer change"
am: 7460c5917b

Change-Id: I9f7927993fb3166cc6aeca751dd97aebc277a5db