Merge "Changed ServiceInfo.Locale to a List"