Check token Expiration

Backport for Folsom.

Bug 1179615

Change-Id: I8516d87ffc72cf35d3bff6fc21cb5324da4ad2bb
Merge remote-tracking branch 'upstream/stable/folsom' into folsom