use of more readable policy language in policy file

Translate the existing policy file to use more
readable policy language syntax.

Change-Id: I3f86d849380aa942ce40af9a271c0af074f59ffd
Merge "use of more readable policy language in policy file"