Merge "Update CookieManager API for Council review." into lmp-dev