Move env

Change-Id: Ie867f0d9ac147b3e1c0fbc76b7dbe61b96f226d1