separate out cookie parsing

Change-Id: Ia41824be01004bb2b79f35b88f0c70c51f4b644d
release errata

Change-Id: I4024f06ef91880009fe08b3f7c31b3659bc659a4