Replace unicode() with six.text_type()

Change-Id: Ib47cd34747fd244829c7a98f9fddb3909fa2c726
Merge "Replace unicode() with six.text_type()"