Merge changes I96dd5761,I196c2eaa

* changes:
  Fix bug that "+" is dropped when performing actions in smart dial search.
  Use parent message for CP2 info in phone_lookup_info.proto.