am 38bfb5a7: Merge "app_process: don\'t pollute the environment"

* commit '38bfb5a7bfc0eeab68f25afad43245efd062caef':
  app_process: don't pollute the environment