Simplify opt-in cookies

* Don't use two cookies where you can use one
* Simplifies accessors greatly

Change-Id: I4db3329d36ee3e5d3af276dae34fc38b4b1f70be
Merge "Simplify opt-in cookies"