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

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