Merge "Adjust cookie max-age from expires time calculation."
am: f967e2a6dd

Change-Id: I6d0c1c9d4d15a8964e3dcae950ba55424b0882c7