Merge "Enforce policy management."