am bbc44ce9: am 291bf56a: am 99710c6c: am ccf9a34b: Add support for disabling email sanitization

* commit 'bbc44ce9b5edb774f96a9ecb688159afd632fb7b':
  Add support for disabling email sanitization