am ff62239b: am 2e216835: am 9220b6e6: am 0dd70276: am 6bdcb981: followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug: 17781603

* commit 'ff62239b026fb2635ffc6bdd3f0ad79d0fab2ee7':
  followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug: 17781603