Merge "Changed Locale in ServiceInfo to a list."
am: a1df5b25e6

Change-Id: I7477fa88ae9cc83605d2172294bf2ecbcafc567e