am 0e014723: am 2a9d1fab: Merge "Make CONTACTS_AS_MULTI_VCARD locale safe"

* commit '0e014723e6d5d2acc3d59b78cee9a6d1fbfef1e9':
  Make CONTACTS_AS_MULTI_VCARD locale safe