base: remove lookupvar and replace with top scope @ var

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