@Connect annotation check and fix for Connector classes (#13120).

Change-Id: Ica594b388d6e35c9a9c8828b92bb64ff3ced460e