am 6725ebc7: Merge "Revert "Revert "init re-execs to set its security context now."""

* commit '6725ebc7b41ae0702adb28d9b40fbd392c6bfb9a':
  Revert "Revert "init re-execs to set its security context now.""