Merge "Pull in two patches from protobuf upstream to suppress warnings"