Merge changes Ie12fd2f4,If92e7595

* changes:
  Handle race condition with CallComposerActivity.onBackPressed
  Skeleton implementation of PhoneLookup and Cp2PhoneLookup.