... and integrate pyupgrade to clean up syntaxes to support Python 2. Change-Id: Idbafe08951a27b8888aad4b800f404cfff86d475