Merge "Changed uid output parameter from an int array to a list of strings." am: 7eae0132c1
am: 4718f665d4

Change-Id: If50101aa678acb3b7f1b79646c8ff5f1eb994865