Bo Yang 6ec0b7e4d1 Merge 3.3.x into master %!s(int64=8) %!d(string=hai) anos
..
main d36c0c538a Down-integrate from google3. %!s(int64=9) %!d(string=hai) anos
test 6ec0b7e4d1 Merge 3.3.x into master %!s(int64=8) %!d(string=hai) anos