Merge "Annotate public methods in ConnectivityService." into nyc-mr1-dev