am de97f798: am bed08333: am c0e1bc1c: Merge "Drop /data/system as a policy file location"

* commit 'de97f798a1c24303de35ff44e2f47b590b46a815':
  Drop /data/system as a policy file location