am 7627f105: Merge "init: 64-bit build issue"

* commit '7627f105c028ab65a1edc5a60e3e21ac2c626edd':
  init: 64-bit build issue