search: remove lookupvar and replace with top scope @ var

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