Merge "Fix for CookieStoreImpl and more tests around Cookie handling" am: 50cf0110a3 am: 8fb1a3aba7
am: 47f494be04

* commit '47f494be04fe0cf1424ca7f87414dbb2512681ba':
  Fix for CookieStoreImpl and more tests around Cookie handling