Changed class to non static

The builds were broken due to this class being static.

Change-Id: Id6911ee383fe2b930b32af37a9249b054d510e16