am f58c3397: Merge "Pass Framework Cleanup"

* commit 'f58c3397ab1163b8e8e1e8f6ad373665b1f3ef9e':
  Pass Framework Cleanup