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

Change-Id: I34562b9ac0ee2a014b744ff786eaa578ed2061d8