Fix int truncation in auth token handling am: ce99f58cfe
am: fd50048189

Change-Id: I99f42f4809ca899acc8adf7a880ae0867e19044a