Merge "Small fixes for environment variables."
am: fd0cb496b1

Change-Id: Ie65c27691e5a2ebb8923d83d16eae182744dc93f