Hygiene: Remove unnecessary uses of getTokenWithEndpoint

This method is only needed when going cross domain.
Add some new FIXMEs

Change-Id: I3756e88801d119c2db8fc9ff90b74c4dde0c57e6
Merge "Hygiene: Remove unnecessary uses of getTokenWithEndpoint"