Resolved issues with Environment::Get

Change-Id: I1b0ecc93fbda1282190df56710156442d9e2e21e