am 4a50662e: Merge "Clean up pass driver"

* commit '4a50662eeaa0b1a26be66e7584fb765151dabc59':
  Clean up pass driver