Merge "Make "export contacts database" more secure" into jb-mr1-dev