Merge "Policy config parser: migrate to BP and drop legacy format"