Update comment + six.text_type instead of str for name

Change-Id: I84c683f3ef0c2c2369d845c234e94e532346d909
Merge "Update comment + six.text_type instead of str for name"