Fixed WriteMessageTest.Variant to expect the new varint encoding.
Merge branch 'sam_1427' into next