Fix old-style classes declaration

Change-Id: I8759dd64637e5150f6744d0989eaa5e584487f5e
Merge "Fix old-style classes declaration"