Fix auto-token generation

Change-Id: Ic1d506ff51832bb8fd6d26b72dbb424da5b5aa9d