Python 2 is no longer supported, thus usage of six can be removed. Change-Id: I7442242289f269d95432209e74caa3cd3917ac5d