Merge "fix line length warnings from Jenkins"