Merge "Don't debug log on ConditionManager" into nyc-dev