Merge changes from topic "am-673b70e5db154dbca678dcaa759eb755"

* changes:
  [automerger skipped] Merge changes from topic "protobuf-3.9.1" am: 2e928fb6 am: 89ee99a0 am: 1a1c84d6 am: 88b8d5c8 -s ours am skip reason: change_id I0b101555ff604df17b2e3e06f3b3ce25adb1c9fb with SHA1 3f51ab5c is in history
  [automerger skipped] Adapt to google::protobuf::uint64 type change am: f74defb8 am: 595bfb9b am: 6b1de174 am: 92fb855e -s ours am skip reason: change_id Ib2d3f4e17857f8ccbbe342ce6678e76b591df510 with SHA1 d013a882 is in history