Remove @abstract from classes which can be instantiated

Change-Id: I51ae4b963d82091e7dcdf44357a573b3d8bd0c58