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

Change-Id: I30a614cedc0ccd24117f061776f5b0332670ca46