Merge "Fix for CookieStoreImpl and more tests around Cookie handling"
am: 50cf0110a3

* commit '50cf0110a3938c34c69b1e00333b6c68cb0a10ba':
  Fix for CookieStoreImpl and more tests around Cookie handling