Merge "Remove references to nonplat sepolicy"