Merge "Adapt to google::protobuf::uint64 type change" am: 05a08644bf am: 19f6a6ce5d
am: 1c0df226cf

Change-Id: Ib30bca0b830259fd18edc3a4679102db89aaa99f