Merge "Avoid marshalling default-valued fields"