Merge "Add Legacy Op Policy Persistence"