Merge "[automerger skipped] Merge "Adapt to google::protobuf::uint64 type change" am: 05a08644bf am: 19f6a6ce5d am: 1c0df226cf am: 82a750d29f -s ours am skip reason: change_id Idb741c8be97df1c752083350fb8fed257903944c with SHA1 b84a4690f5 is in history"