am 8299ff70: Merge "init: 64-bit build issue" into klp-volantis-dev

* commit '8299ff701b66caf513e6cc8807b413bf44b8c2f6':
  init: 64-bit build issue