Merge "Include correct type of SELinux policy"