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

* commit '85dfe98830c78f1c3d400ca7be4ac594bfcdd275':
  Fix environment variable assignment in init