Python 2 support was removed long ago so we can clean up the syntaxes to support it. Change-Id: Ice61f9c4fce2a5b43f867840e5182d2fbe7fc14a