Factory: Use Class.super instead of hard coding parent class

Change-Id: Ic1bb14f5346bd21e54d87085648bcc523b6f1215