[DO NOT MERGE] Use tokens instead of account access trackers
am: 32bfb594af

Change-Id: I1706ecca7b3b98a2a38483545270941ce8899939