rescope tokens unscoped to scoped only

Change-Id: I057c0fd74ce26c19431c9ad62be90ca22b5d66c7
Merge "rescope tokens unscoped to scoped only"