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