Merge "Remove non-protobuf path."