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

Change-Id: Ib3d3fde7b4b28a45de1fa86ba433dcad2577a698