Fix so that CSV as str return value

Closes-Bug: #1367393

Change-Id: I0e40b51482d62b94baab1187ddcc38e4aa2d854d
Merge "Fix so that CSV as str return value"