Fix incorrect default for token expiration

Change-Id: Ieb0d88b28d3255d71b46599b87ab9f0c1d313cf8
Closes-Bug: #1395178
Merge "Fix incorrect default for token expiration"