Change to Unsetenv

Change-Id: Ic84a0e0b50496af88c853e27dfe37fafd6b8afec