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

Change-Id: I546575691281d988ed6302d0ae2fccb520c861b3