Merge changes from topic "protobuf-3.9.1"
am: dfe1e15650

Change-Id: I8e2bb0d9c095b9aa9f6f435d31c8b4770437f8dc