Merge "Adding extra rc commands to fix incidentd with respect to selinux"