Merge "Support clearing cookies by adding it with "max-age=0""
am: 91ab66b600

Change-Id: I64d9a451b7ca20ac2339b57993c3216ecc0033a9