Merge "Add "@Override" annotation"