Revert "Merge "Remove usage of admin_token""

Original patch requires:
Iffbf4e5552b0c3db052ca42fe55832a865bcc7d5
I3cf8f43cb03bfe3c523d78f57d2082451187649b
Ibe3844da784656f02673c32c2f98cb67bbdb3e89

This reverts commit f06a62bd8b0e0c4b9d3d9e4caa5cbccf6535a036, reversing
changes made to 349ef85e33497b315b56a3b74ef9f272bc8eb6e8.

Change-Id: Ice997480e3470dcd87f5ae52deb7a83386e50a08