[IMPROV] Tokens: Only load all tokens if it can be done in one request

Change-Id: I48f3424399c82083c7f13481f0d103780113fcb1
Merge "[IMPROV] Tokens: Only load all tokens if it can be done in one request"