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

* commit '8fb1a3aba77c9c4473f8c5698fb051fa83e7bd35':
  Fix for CookieStoreImpl and more tests around Cookie handling