Merge "Updates to SELinux policy."