Merge "Fix flake8 E265 errors"