Merge change 23343 into eclair

* changes:
  Use Email.TYPE_MOBILE