Merge commit 'c15934f26a235a8218f9f673ebf8227acccefff2' into eclair-plus-aosp * commit 'c15934f26a235a8218f9f673ebf8227acccefff2': [Issue 2165234] Removing nickname clusters: John/Jack and Patrick/Rick.
Merge commit 'c15934f26a235a8218f9f673ebf8227acccefff2' into eclair-plus-aosp * commit 'c15934f26a235a8218f9f673ebf8227acccefff2': [Issue 2165234] Removing nickname clusters: John/Jack and Patrick/Rick.