Merge "Fix flow of local/remote lookups" into klp-dev
tree: 95b5141b627a71dc38e9bf781062a128c3857ccc
  1. InCallUI/