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

Change-Id: I9fed00a764b00d203225e23c5fbd11fd409e5011