This is part of the steps to remove usage of six library, which is no longer needed since python 2 support was removed. Change-Id: I675eff8634ce772839f086b2d07fa0a35cf759b1