Merge "Add ConnectivityServiceIntegrationTest" am: 324d724fd7 am: ef8268d3b0
am: c7e7bb213c

Change-Id: I256ee5f6bad08b4a6ca5037a80388b478ebff266