Merge changes from topic "revert-protobuf3.5.2" am: a4680e1ebe
am: 3e312d20cd

Change-Id: I096f3b5a5a985ce7926ccb71fa07eda69d078ed3