Merge "Write policy file less"