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

Change-Id: Iae43445ebe8f2c3a702e69c75b5444c81d68dc61