Follow up changes from review of Ib2afc992.

- Fixed some minor issues in the editor comparator
- Fixed some issues with phone local contacts

Change-Id: Ibc1b1f7d23aa33f899eaa4c0a21fde59284b6f4a
3 files changed