Merge changes from topic "protobuf-3.9.1" am: 537e4af235
am: 96fd084fb4

Change-Id: I86768bd75216475d6c77be40f6715054089b5376