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

Change-Id: I8275ba97d21a027a5341152fcdfd172a9d262f5a