[automerger skipped] Adapt to google::protobuf::uint64 type change am:...
[automerger skipped] Adapt to google::protobuf::uint64 type change am: f74defb8 am: 595bfb9b am: 6b1de174
am: 92fb855e -s ours
am skip reason: change_id Ib2d3f4e17857f8ccbbe342ce6678e76b591df510 with SHA1 d013a882 is in history
Change-Id: Id8bff88e1bc4c4cc96e16339a5e29d6e06e80d08