Merge "Fix CookiesTest#testCookieStoreNullUris"