Better log failed token checks

Change-Id: I18afbb7a8edfe55f265f6e8857eff7a1a2e97f2e
Merge "Better log failed token checks"