Merge "Fill in policies for default zen rules." into main