Merge "Improve sepolicy labeling and domain confinement."