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

* commit 'ad23e7bf78b3826ed2eb4866593386af1533a2b4':
  Condition cleanup.