Reduce cookie tracking [3/4]

Change-Id: Ibc1c8d3160a89de51531a89c5103b47ba2c2c649
Merge "Reduce cookie tracking [3/4]" into du44