Change the session.invalidate to just remove attribute from the session

Reviewer: Dan V

Issue: GCP-9026