Error: Unmark as @abstract

We instantiate it all over, so clearly it isn't abstract.

Change-Id: I360c1fbc44a01ca0fa2909cb9beb613d21ec4c6c
Merge "Error: Unmark as @abstract"