Merge "remove legacy operational policies support"