Get policies from a disk safe
Merge branch 'disk_safe_policies' into cdp_service