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

Change-Id: I62cc7133ad90c78d350f2ce2f599cc7dee3cf64f