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

Change-Id: If5bf11a8de5032b7693478df100c786f6852727d