Merge "Fix InvalidProtoWireException" into sc-dev