am 8b8f7989: Fix for bug 3407633 Cookie not set in CookieManager - DO NOT MERGE

* commit '8b8f79898d5d0a283c481dedda2cc161a5a673b3':
  Fix for bug 3407633 Cookie not set in CookieManager - DO NOT MERGE