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

* commit 'c458f77ccd89757cf82b2e839715f467d87f901e':
  Make "export contacts database" more secure