Make class non-fonal so it can be mocked

Change-Id: Iaeccf2c03aa1c8aadde9555faa6f1be51c15818b
Merge "Make class non-fonal so it can be mocked"