Merge "Leftovers of the SELinux policy update mechanism"