Merge "[POLICY] Remove hardcoded credentials from policy-distribution" into frankfurt