Merge "Import upstream change: HttpCookie.domainMatches("hostname.local", "hostname") should return true"