This will allow us to create releases with Python 2 support, while moving forward with the Python 2 drop on master. Change-Id: Ie7a8f36c3b88f5451c44c5a37f1ac3543a942e6e