Merge "Clean up JavaDoc for CookieManager" into jb-mr1-dev