Merge "Use id-based zen rule APIs."