am fc183f65: am 16ea297f: Merge "Tests for environment variables utility functions"

* commit 'fc183f65c9dd5d97c744ea60c99c8ae7fdc7f986':
  Tests for environment variables utility functions