am 9357fc5b:     More aggressive fix for phone lookup issues.

* commit '9357fc5b4f8d4646df6477138071a3bd931bb86e':
  More aggressive fix for phone lookup issues.