Merge "Adapt to google::protobuf::uint64 type change" am: b8fd364d0a
am: 5e349ea3f6

Change-Id: I0781d141b1ab2d6ff268bfec0c1915a3bda66eac