Merge "Fix general multi-image TODOs."