Merge "Fix flake8 E405 errors"