Merge "Api review: AutomaticZenRule" into nyc-dev