Merge "Fix bug when adding op policy"