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

Change-Id: I3ba12604da8a2c877124d5fdb474fb378991181f