am 394ee3b8: am 4a8fd5fd: am 80e38f48: remove cookie expiration and add max-age of 2 years. bug: 17781603

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