six is no longer needed since python 2 support was removed. Change-Id: I87eef25a2e9f81aa6c6a31f4dcb9c900b8984162