Merge changes from topic "protobuf-3.9.1"
am: 2e928fb62a

Change-Id: Ia406920b1a0a9309936e329d12f7ee3099525ba6