base: remove lookupvar and replace with top scope @ var

Change-Id: Ida7e2602ae5705c1279b47e51a710fb13db8744b
Merge "base: remove lookupvar and replace with top scope @ var" into production