Fixed old style class declaration

Change-Id: Ifc2f61146dd77c4c287c0adbf5410b51d564accf
Closes-bug: #1392771