Merge "Fix: Inaccurate mangled names." am: b16d06d44d
am: 580b77a7bd

Change-Id: Ibc88bc4e90c5721f24dfaa860ee4d3a04784b97c