Also get our tokens from ApiTestCase

Change-Id: I830157d7c3ddefd1ec3a168bfb45c065df08265c
REQUIRES: I5d517eca7529dd57e1 IN CORE <<< ----------
Merge "Also get our tokens from ApiTestCase"