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

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