Merge "Don\'t demangle symbol names." into lmp-dev am: 6914799 am: 53cacfa  -s ours am: af857f6
am: 44e6cff

* commit '44e6cff67ff0902dba5d833805b8902f21597a7f':
  Don't demangle symbol names.