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

Change-Id: I0d8fdf391c02793a27d4f07358bcb39a295e0ec5