Merge "Don\'t demangle symbol names." into lmp-dev
am: 6914799

* commit '69147994ba50146e1f9c7d98136429057627b4bd':
  Don't demangle symbol names.