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

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