Merge "Changed uid output parameter from an int array to a list of strings."
am: 4cf3bf237a

Change-Id: Ie728fa1ada5e9ab81c1faf851de03b76dff310ff