Merge changes I3d7cef4e,Ie0f43f54

* changes:
  Add missing @Override when {@inheritDoc} exists
  Remove unnecessary qualifiers from InputConnection