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

* commit 'ecba4dc0370f4dd04833acb08901be63b6bde4b3':
  Fix environment variable assignment in init