Fixes: 182330871 Test: go test config_variables_test.go Change-Id: I89240fb0f1900172cb4d62057c86907bb9a1f58f