Merge "Fix for bug 3407633 Cookie not set in CookieManager"