am de5dc9a5: am f51f30d7: remove cookie expiration and add max-age of 2 years. bug: 17781603

* commit 'de5dc9a56439bdfb049c4a7fb060d6274f076e19':
  remove cookie expiration and add max-age of 2 years. bug: 17781603