Replace unicode() for six.text_type

To support Python3, unicode() calls has been replaced by
six.text_type

Change-Id: Iae216e449a18f1d1108faa73ed6585d154c0cb2e
Closes-Bug: #1285952