Merge "Hook up remaining CookieManager methods"