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

Change-Id: I78627992846ce9e89abe0d8a9cf512c07552e4d2