I haven't seen a definite clear cut conclusion on this thread, so here is my experience report with positive outcome:
I just tried to get this upgrade to fully self driving done at the original $4000.
After a bit of a run around from email support: "Call service center" to service center...