Support the new kiwi's environment api

Change-Id: Ie4b99504d739722827e6d1f58f59f2f03fdb7cb3