Merge changes from topic "protobuf-3.9.1" am: 2e928fb62a am: 89ee99a00d
am: 1a1c84d6bc

Change-Id: Ia7db50a9600e10405c3f3f760804c5280f07e53d