Merge commit 'd2f52de6dd8bf17017f4c43fbdb303dbf7e92372' * commit 'd2f52de6dd8bf17017f4c43fbdb303dbf7e92372': Add "MMS" to common phone number types.