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

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