Merge "Revert "Adapt to google::protobuf::uint64 type change"" am: 4d16ee4f10
am: 435f7eda69

Change-Id: Ic68743522e67b8638481b1e4398a1fc19eb71d5b