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

Change-Id: I0571e189850dcdda7334f6aac9bfa95c40f3e760