Merge "Remove reference to nonplat sepolicy"