Merge "Remove an init. workaround for Cookiemanager."