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

Change-Id: Ieefd1262586a3fbcf13999193c1e058abf1e0a8e