Merge commit '08271d05e338b483b12fae0f52a9519677910176' * commit '08271d05e338b483b12fae0f52a9519677910176': Use Email.TYPE_MOBILE
Merge commit '08271d05e338b483b12fae0f52a9519677910176' * commit '08271d05e338b483b12fae0f52a9519677910176': Use Email.TYPE_MOBILE