Merge "Fix test_signed_image_upload_boot_failure skip method"