misc: remove lookupvar and replace with top scope @ var

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