am 26b00386: am 4a50662e: Merge "Clean up pass driver"

* commit '26b00386a9fc3aa4615a0b60da918ac8606e10ac':
  Clean up pass driver