Merge "Fix issue with pep8 gate job"