Merge "Correctly use int types and fix uint64_t print." into pi-dev am: 53f60f60ee
am: 018f5a3ca2

Change-Id: Ie9715a097e15f7ea277fd8a2e839af2a31d61fea