Merge "Create a new location for /data policy files"