Merge "[Script] Add @Override annotations to overriden methods"