Fix undefined classes

Change-Id: Id61f3ed120f17ea4bee9d685e50fa1c10df74c81
Merge "Fix undefined classes"