Merge "Use common "waiters.wait_for_image_status" function everywhere"