* Cherry pick upstream commit 3f4de98e7c8, which fixes a bug where
duplicate message-ids can cause multiple thread-ids for some message
documents.
* Cherry pick upstream commit 3f4de98e7c8, which fixes a bug where
duplicate message-ids can cause multiple thread-ids for some message
documents.