Merge "Restructure sepolicy for EVS stack"