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

* commit 'fdfec2a1614608b915aa412d515c86db95ecfd8b':
  init: 64-bit build issue