Environment variable adding were fixed.

Change-Id: I4bf9418b1c1f3c98dd2b84286de50e30f1799a6a