Unset some variables

FIX: http://jira.pac-rom.com/browse/PAC-4

Change-Id: I0752852141c528561571a890d1fc3942cc870295
Signed-off-by: Lokesh Chamane <lokesh.c703@gmail.com>
cherries: remove merged cherries

Change-Id: I8feb3aa4b81bda81d8511501287378284b6773d8
Merge remote-tracking branch 'upstream/pac-4.4' into pac-4.4