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: I1143918d70da51b53fbb8112ecafa412cd7d0770