am 9feea559: Merge "Create a new location for /data policy files" into jb-mr2-dev

* commit '9feea559d68559dd74eaf325318014dee33ef9ea':
  Create a new location for /data policy files