Reduce cookie tracking [1/4]

Change-Id: I471e284104467cd299072fbb6704f30d61e6ac02