Fixed issue with sessions for different environments.

Change-Id: I0ed89d7aa5f8b63c2009439adc8e1842ed2285cb