am 4f397f0b: 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 '4f397f0b0fad2bcdb9dcd577780471059bfb723d':
  followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug: 17781603