- avoids downcasting from uint64_t in multiple locations Change-Id: Ia6f669a9ee81336ed1ef29a6a79240d5905acab5