Merge "When serializing Message, don't try to unstub StubUserLang"