merge fix from trunk for issue 410552

fail when coincidence is too far apart

TBR=
BUG=410552

Review URL: https://codereview.chromium.org/558303002
3 files changed