Trigger on fewer other session/token cookies

Change-Id: I32f7811a0fbaae74a363cc7bc144e24817bbecd1