Merge "Remove obsolete environment variables."
am: 961155050f

Change-Id: I556497a379df3e58701760f42b2df18d394954e9