Merge "Rename policy agent component"