am 0b87230c: Merge "Fix flow of local/remote lookups" into klp-dev

* commit '0b87230c2ebe1c842313d8c159513caa5092830b':
  Fix flow of local/remote lookups
tree: f8ce7d9493e6eae9204218b362c61422639d2cea
  1. InCallUI/