Merge "Removes bad comment from CookieManager"