am 24c1ff49: am 5b63c38d: Fix 2306814: Too aggressive suggesting names from my contacts list.

Merge commit '24c1ff4993734a1475d98a3456b8cbae4e16204e' into eclair-mr2-plus-aosp

* commit '24c1ff4993734a1475d98a3456b8cbae4e16204e':
  Fix 2306814: Too aggressive suggesting names from my contacts list.