am fc756f82: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'fc756f82d221fb04dc71c9d5e2e6ef8b75137a02':
  Revert "sendbug improvements on email address handling"