[automerger skipped] Merge "Add connectivity test fragment to KitchenSink" into pi-dev am: bdbf66ece0
am: d574289b9e  -s ours

Change-Id: I2f566adeb62e6d0900ebfe66611c9df924404d57