Jisi Liu 09354db143 Merge from Google internal for 3.4 release %!s(int64=8) %!d(string=hai) anos
..
test6.proto 09354db143 Merge from Google internal for 3.4 release %!s(int64=8) %!d(string=hai) anos