Merge "Fix another inconsistent set of PolicySet values"