Merge "Fix several issues in CookieManagerTest"