Don\'t demangle symbol names. DO NOT MERGE am: a183654  -s ours
am: 908c511  -s ours

* commit '908c511e50c2ed5f69dcafbe82af75d5a090275f':
  Don't demangle symbol names. DO NOT MERGE