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

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