Merge "Clean up JavaDoc for CookieManager"