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

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