Merge "Set Assistant UID of the current user." am: 19a2507ea5 am: 202b6d11e4
am: 022a88a9b7

Change-Id: Ibbe2761dfee2e35d017d67633651f0e659c05535