Cleanup all undefined class analysis warnings

Change-Id: I953aafdd211bb790f0ae69ac986c920c30e3c830
Merge "Cleanup all undefined class analysis warnings"