Unbreak MessageToJsonSerializerTest.
Merge branch '0.90' into 0.91