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

Merge commit 'd7e42d7bcce00f55888588bf2b97d967a47c4cf6'

* commit 'd7e42d7bcce00f55888588bf2b97d967a47c4cf6':