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

Change-Id: I33108c466515a322652104e41ee5787f95f1060d