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

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