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

Change-Id: I00c523bafcbe23b6a3f5024712d6ee3b67f27473