Merge "Use uint64_t instead of long long as API type for consistent reason." into pi-dev