Merge "Support skipping APP_COOKIE and HTTP_COOKIE"