Merge "Track current user without calling into AMS." into nyc-dev
am: 90f4ca78ee

* commit '90f4ca78ee714733dd90427085b496c906e83789':
  Track current user without calling into AMS.

Change-Id: Iccc662940ab9e77182f06b1156aa090df63796e1