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

Change-Id: Ia10cc658a8b0f90fdfdb425208f7cd6cf43656f9