Merge "session: Fix a use-after-free bug." into rvc-dev am: f490e3fe2a am: dcdb54776e am: 6dce209a6a

Change-Id: I3cd3f19c5219e05cbc3bdabca015a3c7ebbfc46a