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

Change-Id: Ic1589a6f6a4ad093c44028815a846b6ab0912c53