Merge commit '7bcf59c43d7b52cff702d3d9bcca322451673a0a' * commit '7bcf59c43d7b52cff702d3d9bcca322451673a0a': fix bug 2134367: failing phone number compare test.
Merge commit '7bcf59c43d7b52cff702d3d9bcca322451673a0a' * commit '7bcf59c43d7b52cff702d3d9bcca322451673a0a': fix bug 2134367: failing phone number compare test.