Merge "Remove legacy operational policy from models"