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

Change-Id: If83ee0aa6477700b4245af9fd16fc94decaa5e97