Replace unicode() by six.text_type for python3 compatability

Using six.text_type to replace the unicode() for py3
compatibility.

Change-Id: Ic90483fb014303a3703d45dc2293234ef24f96e9
Merge "Replace unicode() by six.text_type for python3 compatability"