Merge "Condition cleanup." into nyc-dev
am: 4ed0e8cf8f

* commit '4ed0e8cf8fb38b30f7518286e4d52c091339ae63':
  Condition cleanup.