Merge "Revert "Add support for protected local symbol lookup."" into lmp-dev