Merge "Use public APIs for modifying automatic zen rules."