Merge "[POLICY] Change policy-distribution configuration"