Merge "Revert "init re-execs to set its security context now.""