Merge "Allow wait_for_image_status() to have multiple"