Merge \"Annotate public methods in ConnectivityService.\" into nyc-mr1-dev
am: 1c86bfbcf4

Change-Id: I065e2ceb351ea8af4310f6ef11f1af232fa2fc79