Jisi Liu 09354db143 Merge from Google internal for 3.4 release 8 anni fa
..
java 09354db143 Merge from Google internal for 3.4 release 8 anni fa
proto 33cc25f36c Remove duplicated copyright statement 8 anni fa