Merge "Don't demangle symbol names." into lmp-dev