merge from open-source master
tree: 1c67dd17ac58952435d1e823abf2bb9b37e66449
  1. policy/