am 3bcd414b: Merge "Clean up some of our python scripts."

* commit '3bcd414b78e515482139c7dc3dad8cad3357b374':
  Clean up some of our python scripts.