Merge change 25894 into eclair

* changes:
  Adding CONTENT_TYPE to CommonDataKinds.Email