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

Change-Id: I0fdd3bea8ff31c71e78ba37900382c02b7e4667b