am a7789da8: am 55882de4: am c1291b32: Merge "Fix allocation-less launches."

* commit 'a7789da8b94b4308a6d48951a951a0849bad6ce2':
  Fix allocation-less launches.