Fix: missing proper env setting

Change-Id: Ie4b6ddca64aa7f23daa0fa36e1200f89614dfdad
tag v0r0p19

Change-Id: I958e1b340cfe5108c9d670f3fbbe55cc5f8be342