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

Change-Id: Ic4de97090826dae6e79ee2fa4f173b9c7f6ee000