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