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

Change-Id: I4786ab7df710d7bc43ae8153b8c0479a1dbabc7d