Merge "Revert "Adapt to google::protobuf::uint64 type change""