Merge commit '948a119c' into eclair-plus-aosp * commit '948a119c': Revert the default phone number comparation algorithm.