Merge "Remove @abstract annotation"