Merge "Merge "Track current user without calling into AMS." into nyc-dev am:...
Merge "Merge "Track current user without calling into AMS." into nyc-dev am: 90f4ca78 am: e43fb2e5" into nyc-mr1-dev-plus-aosp
am: c22b5b05
* commit 'c22b5b05':
Change-Id: I696eacfba65b1c0a050f86dca5c389de99135596