Merge "[DO NOT MERGE] Use tokens instead of account access trackers" into nyc-mr1-dev