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

* commit '2c3d095ac1297a003c0fb3dfd33acee7aa732aef':
  init: 64-bit build issue