am 28e95a64: am 1bc86038: Cherry-pick Fix for GB upgrade issue with phone lookups.

* commit '28e95a64ca31af9f6cd0f54144b4ceaf6b836d42':
  Cherry-pick Fix for GB upgrade issue with phone lookups.