Use core token handling

Bug: 62614
Change-Id: I91e66fafd63689cb14d0bd1969b02f56da17a202
Merge "Use core token handling"