Update setup code past d2to1

Change-Id: I54c63423a4b25857e518ab532378bf734abef1bb