Previously used environment variables exclusively. Change-Id: If4b4266ce66212d7ae2579e7da6d3bae779ad04a