Make class non-fonal so it can be mocked

Change-Id: I012a3c930cc881477609e20b02b90ae523389e4f