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