am bd6c4703: (-s ours) am 004cc72e: Merge "Fix projection columns for FDN import from contact." into mnc-dev

* commit 'bd6c4703b768f1c9dba13f20a7412e75b54cc34f':