Merge "Fix flake8 H404 errors"