Merge changes Ibf3fe8c7,I152c0b71 into main

* changes:
  Stop reading redundant policy definition.
  Deduplicate policy reading code.