Merge "Revert "Write policy file on background thread""