Merge "Remove py2 usages"