This reverts commit 681cfcf4. Test: m RunCarSetupWizardLibRoboTests Change-Id: Ic5da2817c0c1166d171969ce98c3a5ccdb629af2