Fix old style class declaration

Use new style (inherit from `object`) instead of old style class declaration

Change-Id: Ife13065cce0213984eed6f909e89dabb15ecbd44
Closes-Bug: #1380723
Merge "Fix old style class declaration"