Merge "Use consistent style when checking env vars."
am: 98399b8667

Change-Id: Id7b383cc5edaf8a7e23489bd6f3374d445ef83f5