Fix failures due to undefined variables

Change-Id: I206ef2f86bd9f4254fafc509355f08389388f89f
2 files changed