Fix int truncation in auth token handling
am: ce99f58cfe

Change-Id: I79ee9f98805542c21cf2ceb3e410dff0d95a37e7