am ae2533bc: Merge "Ensure void type is resolved when running without image" into lmp-mr1-dev

* commit 'ae2533bc91e04915335cc2d8a3c60021a3b3fade':
  Ensure void type is resolved when running without image