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

Change-Id: I122144d2c9df8e6679435b9afd860353e3f11296