Merge "Fix broken CTS HttpCookie test"