Code cleanup. Fix buffer overflow crash. Fix type being truncated to 199 characters. (cherry picked from commit 9226e212053ef8ec10eeb9509f2ce6ec002d8e3b)
Code cleanup. Fix buffer overflow crash. Fix type being truncated to 199 characters. (cherry picked from commit 9226e212053ef8ec10eeb9509f2ce6ec002d8e3b)