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

* commit '94fc236d199460bddc390ce7f384b446c14df622':
  Make CONTACTS_AS_MULTI_VCARD locale safe