Merge "Fix the pylint issues that have built up..."
am: 62e5e156f6

* commit '62e5e156f6be3e2b7dc6a0529de3b98428bc14f5':
  Fix the pylint issues that have built up...