Merge "Changed ServiceInfo.Locale to a List" am: 9337ab17bf
am: 591cbdbed4

Change-Id: I8a84995c9d7835eb839a6cabc0e8007d5eeaec4d