Merge "Added @Override annotation above signature"