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

* commit '913613a51dc57c001f00eb81752a8de43883a16e':