Don't call back into AM to get current user.

Bug:13079471
Change-Id: I733d6e3c41c91008406261eac827e6b65bb400db
2 files changed