Cleanup invalid token exception text

The invalid token exception text was not as clear as it could be.

Change-Id: I73692f86652cde1574d60a6aba7f44611a9fcca6
Merge "Cleanup invalid token exception text"