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

Change-Id: I34bb15d661787f0049f25eff273c4f5c5c8422fd