Merge "Remove wait_for_image_resp_code"