Fixing remove session between function bug

Change-Id: I428507954aff1035dbf50da87d4aabce7d2ba827
Signed-off-by: TanelDettenborn <tanel.dettenborn@gmail.com>
Merge "Fixing remove session between function bug"