Made sanity code to prevent session use actually work

Change-Id: I3d06ab29b6255b925b3a83aab12ca0dbaa3496fc
Merge "Made sanity code to prevent session use actually work"