extract vars

Change-Id: I52a74055b256630b5fd513eb895e7e4ecc9176b9