Merge "Stop disabling selinux"