Merge "Remove @override annotation"