Merge "Drop /data/system as a policy file location"