Changes for supporting guest_token cookie.