Merge "SessionManager: Add provision for encrypting session data"