Hygiene: Cleanup potentially undefined variable warnings

Change-Id: Ifba0f44e0c8aec589e15107c22866a6926a43476
Hygiene: Cleanup undefined class warnings

Change-Id: I62d647ad90418db8b5da7ff2c01205f118bb117b
Merge "Hygiene: Cleanup potentially undefined variable warnings"
Merge "Hygiene: Cleanup undefined class warnings"