am 2a9d1fab: Merge "Make CONTACTS_AS_MULTI_VCARD locale safe"

* commit '2a9d1fab1669d2962aa830872f063c1180fbea94':
  Make CONTACTS_AS_MULTI_VCARD locale safe