7f7c03a935
Replace with an env abstraction. Change-Id: I706374d265a270890e1f3ca920a10a0dc09624b0 Signed-off-by: Ben Walker <benjamin.walker@intel.com>