Merge "Fix invalid key warning in CookieSessionProvider error handling code"