Merge "Track current user without calling into AMS." into nyc-dev