am 796fccb8: Merge "Fix environment variable assignment in init"

* commit '796fccb80d603bb79d2591047f1c3b83755bfa8b':
  Fix environment variable assignment in init