Merge commit 'f36a2bb59b846545946124124d3290bd3eec44f0' into eclair-plus-aosp * commit 'f36a2bb59b846545946124124d3290bd3eec44f0': Call the proper variant of markAsContacted.