Merge commit '897ed06704cd24ee537e0c4de546c90e8d13642c' * commit '897ed06704cd24ee537e0c4de546c90e8d13642c': Adding CONTENT_TYPE to CommonDataKinds.Email
Merge commit '897ed06704cd24ee537e0c4de546c90e8d13642c' * commit '897ed06704cd24ee537e0c4de546c90e8d13642c': Adding CONTENT_TYPE to CommonDataKinds.Email