Add environment variables

Change-Id: I3be55e47ad4d24966ca746edff607a674379d37f